Fixes Abracadabra and Improvised Skill #2859
Closed
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The Autocast by abra was cleared before the actual casting, which resulted in failure of skill if not learned. Fixes HerculesWS#2823 Fixes HerculesWS#2824
dastgirp
added
component:mechanics:skills
4144
reviewed
Oct 2, 2020
| @@ -1155,7 +1155,7 @@ static int unit_skilluse_id(struct block_list *src, int target_id, uint16 skill_ | |||
| int ret = unit->skilluse_id2(src, target_id, skill_id, skill_lv, casttime, castcancel); | |||
| struct map_session_data *sd = BL_CAST(BL_PC, src); | |||
|
|
|||
| if (sd != NULL) | |||
| if (sd != NULL && ret == 0) | |||
There was a problem hiding this comment.
this mean after this change auto cast never cleaned if skill was used without errors?
i think this wrong
There was a problem hiding this comment.
unit->skilluse_id2() returns 0 on failure, so this is okay.
Maybe the
else if (sd != NULL && ret != 0 && skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL)
skill->validate_autocast_data(sd, skill_id, skill_lv);block I removed in #2699 (LINK) should be re-added, too.
I currently can't have a closer look at this, so this is just a suggestion...
There was a problem hiding this comment.
@4144 the problem is, this function is triggered before actual casting of skill, so removing this check caused autocast struct to be emptied, and skill failed to cast.
There was a problem hiding this comment.
@dastgirp This definitely needs to be adressed what 4144 mentioned.
There was a problem hiding this comment.
I just had a look at this and the condition should be changed to:
if (sd != NULL && (ret == 0 || (skill_id != SA_ABRACADABRA && skill_id != WM_RANDOMIZESPELL)))
Kenpachi2k13
approved these changes
Oct 5, 2020
AnnieRuru
approved these changes
Oct 5, 2020
MishimaHaruna
added a commit
to MishimaHaruna/Hercules
that referenced
this pull request
Apr 6, 2021
This commit introduces various fixes to the Abracadabra / Improvise skill validation: - autocast code is moved to after homun/merc skill ranges so that when any of those are triggered, autocast data is not purged - abracadabra/improvise is no longer purged immediately after cast, by calling autocast_clear_current in the proper manner - the abracadabra/improvise skill requirement bypass that was removed in HerculesWS#2657 and related pull requests is re-implemented - the condition that would get the character stuck and unable to cast other skills until teleporting or relogging when rolling AL_WARP from abracadabra (i.e. because AL_WARP lands in clif_parse_UseSkillMap in 2 steps) is fixed, by not immediately clearing the data after the first one All credits for the fix go to Heka of Origins Related to HerculesWS#2859 Fixes HerculesWS#2823 Fixes HerculesWS#2824 Signed-off-by: Haru <[email protected]>
3 tasks
|
I'm closing this in favor of the more complete fix (extensively tested on a production server) from #2972 |
MishimaHaruna
added a commit
to MishimaHaruna/Hercules
that referenced
this pull request
Apr 6, 2021
This commit introduces various fixes to the Abracadabra / Improvise skill validation: - abracadabra/improvise is no longer purged immediately after cast, by calling autocast_clear_current in the proper manner - the abracadabra/improvise skill requirement bypass that was removed in HerculesWS#2657 and related pull requests is re-implemented - the condition that would get the character stuck and unable to cast other skills until teleporting or relogging when rolling AL_WARP from abracadabra (i.e. because AL_WARP lands in clif_parse_UseSkillMap in 2 steps) is fixed, by not immediately clearing the data after the first one All credits for the fix go to Heka of Origins Related to HerculesWS#2859 Fixes HerculesWS#2823 Fixes HerculesWS#2824 Signed-off-by: Haru <[email protected]>
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Pull Request Prelude
The Autocast by abra was cleared before the actual casting, which resulted in failure of skill if not learned.
Changes Proposed
Adding ret = 0 check while casting skill, to clear the autocast data
Issues addressed: